Merge commit 'origin'
authorJohan Dahlin <johan@gnome.org>
Wed, 12 May 2010 22:54:28 +0000 (19:54 -0300)
committerJohan Dahlin <johan@gnome.org>
Wed, 12 May 2010 22:54:28 +0000 (19:54 -0300)
commit39f4b34e70892a13e26224456844081e83365213
tree9c27166804fb51173f547e943e329e6c7e8414ad
parent7b814209742e16ffe5ac0eb324e3e57f0faf34b2
parent006d5718fa927d9d3509fca1a1c1ca6522110b57
Merge commit 'origin'